Fixed all impending problems