- Small fixes & cleanup