Code

Minor fixes