Fixed minor busgs