Fixed: Small fixes