Fix for small bugs
Fix for small bugs