Minor fixes

Just fixing some issues