Fixed all remaining problems