General - Fixed bugs