Add bug fixes
Board: Initial commit